Merge from trunk, resolve conflicts.
authorEli Zaretskii <eliz@gnu.org>
Sun, 14 Apr 2013 17:27:45 +0000 (20:27 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 14 Apr 2013 17:27:45 +0000 (20:27 +0300)
commit5edaa09816ddfec31e4729562309f3f275eebbb0
tree95983bafb17887e107318645151d36585fec20af
parent32dd148484d66195884ad0f62da57970c5c73ca5
parentc40ccb49018d38db59fb5b4dd74989c02485f5d1
Merge from trunk, resolve conflicts.
configure.ac
lib/Makefile.am
src/Makefile.in